Skip to content

OTA-1813: Drop a local label on alert-risk e2e#1363

Merged
openshift-merge-bot[bot] merged 3 commits intoopenshift:mainfrom
hongkailiu:rm-local
Apr 3, 2026
Merged

OTA-1813: Drop a local label on alert-risk e2e#1363
openshift-merge-bot[bot] merged 3 commits intoopenshift:mainfrom
hongkailiu:rm-local

Conversation

@hongkailiu
Copy link
Copy Markdown
Member

@hongkailiu hongkailiu commented Mar 30, 2026

This is to follow up [1].

We need to fire an alert to test the feature, but it would lead
to a job failure unless we get an exception from TRT via [2].

The local label exclusion in test configuration [3] are left
for the "local" cases in the future.

Then make test informing.
This is to avoid blocking of OCP release from the new e2e
test. We will remove the informing label when we feel
confident about the collected stats from Sippy about the test.

[1]. https://github.com/openshift/cluster-version-operator/pull/1329/changes#r2977643526

[2]. openshift/origin#30929

[3].

ext.AddSuite(extension.Suite{
Name: "openshift/cluster-version-operator/conformance/parallel",
Parents: []string{"openshift/conformance/parallel"},
Qualifiers: []string{
`!(name.contains("[Serial]") || "Serial" in labels || name.contains("[Slow]") || "Local" in labels)`,
},
})
// Serial tests run in isolation, however they must return the cluster to its original state upon exiting.
ext.AddSuite(extension.Suite{
Name: "openshift/cluster-version-operator/conformance/serial",
Parents: []string{"openshift/conformance/serial"},
Qualifiers: []string{
`(name.contains("[Serial]") || "Serial" in labels) && !("Local" in labels)`,
},
})

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Mar 30, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Mar 30, 2026

@hongkailiu: This pull request references OTA-1813 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

This is to follow up [1].

We need to fire an alert to test the feature, but it would lead
to a job failure unless we get an exception from TRT via [2].

Then make test informing.
This is to avoid blocking of OCP release from the new e2e
test. We will remove the informing label when we feel
confident about the collected stats from Sippy about the test.

[1]. https://github.com/openshift/cluster-version-operator/pull/1329/changes#r2977643526

[2]. openshift/origin#30929

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 30, 2026
@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Mar 30, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 69749988-9948-485e-9d35-c67bcb203025

📥 Commits

Reviewing files that changed from the base of the PR and between 910629c and 8711da4.

📒 Files selected for processing (2)
  • .openshift-tests-extension/openshift_payload_cluster-version-operator.json
  • test/cvo/accept_risks.go
✅ Files skipped from review due to trivial changes (1)
  • .openshift-tests-extension/openshift_payload_cluster-version-operator.json
🚧 Files skipped from review as they are similar to previous changes (1)
  • test/cvo/accept_risks.go

Walkthrough

Updated a Ginkgo test to import and apply the oteginkgo.Informing() modifier to an existing test case; updated the test payload JSON to change the test's labels and lifecycle to reflect the informing lifecycle. No test logic or control flow changed.

Changes

Cohort / File(s) Summary
Test modifier update
test/cvo/accept_risks.go
Imported github.com/openshift-eng/openshift-tests-extension/pkg/ginkgo as oteginkgo and added oteginkgo.Informing() to the g.It(...) modifiers for the "should work with risks from alerts" test.
Payload metadata update
.openshift-tests-extension/openshift_payload_cluster-version-operator.json
Changed the test entry for "cluster-version-operator should work with risks from alerts" by replacing labels: { "Local": {} } with labels: { "Lifecycle:informing": {} } and updating lifecycle from "blocking" to "informing".

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands and usage tips.

@hongkailiu
Copy link
Copy Markdown
Member Author

/testwith openshift/cluster-version-operator/main/e2e-agnostic-ovn-techpreview-serial openshift/origin#30929

@hongkailiu
Copy link
Copy Markdown
Member Author

The previous one failed on scheduling issue. Let us retry.

/testwith openshift/cluster-version-operator/main/e2e-agnostic-ovn-techpreview-serial openshift/origin#30929

@hongkailiu
Copy link
Copy Markdown
Member Author

/retest

@hongkailiu
Copy link
Copy Markdown
Member Author

/testwith openshift/cluster-version-operator/main/e2e-agnostic-ovn-techpreview-serial openshift/origin#30929

@hongkailiu
Copy link
Copy Markdown
Member Author

/retest

@hongkailiu
Copy link
Copy Markdown
Member Author

/testwith openshift/cluster-version-operator/main/e2e-agnostic-ovn-techpreview-serial-1of3 openshift/origin#30929

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Mar 31, 2026

@hongkailiu, testwith: could not generate prow job. ERROR:

BUG: test 'e2e-agnostic-ovn-techpreview-serial-1of3' not found in injected config

@hongkailiu
Copy link
Copy Markdown
Member Author

/retest

@hongkailiu
Copy link
Copy Markdown
Member Author

/testwith openshift/cluster-version-operator/main/e2e-agnostic-ovn-techpreview-serial openshift/origin#30929

This is to follow up [1].

We need to fire an alert to test the feature, but it would lead
to a job failure unless we get an exception from TRT via [2].

The local label exclusion in test configuration [3] are left
for the "local" cases in the future.

[1]. https://github.com/openshift/cluster-version-operator/pull/1329/changes#r2977643526

[2]. openshift/origin#30929

[3]. https://github.com/openshift/cluster-version-operator/blob/bb70c3bf2e0fee968cf02bae00b97b7be837a8b0/cmd/cluster-version-operator-tests/main.go#L23-L38
This is to avoid blocking of OCP release from the new e2e
test. We will remove the informing label when we feel
confident about the collected stats from Sippy about the test.
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Mar 31, 2026

@hongkailiu: This pull request references OTA-1813 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

This is to follow up [1].

We need to fire an alert to test the feature, but it would lead
to a job failure unless we get an exception from TRT via [2].

The local label exclusion in test configuration [3] are left
for the "local" cases in the future.

Then make test informing.
This is to avoid blocking of OCP release from the new e2e
test. We will remove the informing label when we feel
confident about the collected stats from Sippy about the test.

[1]. https://github.com/openshift/cluster-version-operator/pull/1329/changes#r2977643526

[2]. openshift/origin#30929

[3].

ext.AddSuite(extension.Suite{
Name: "openshift/cluster-version-operator/conformance/parallel",
Parents: []string{"openshift/conformance/parallel"},
Qualifiers: []string{
`!(name.contains("[Serial]") || "Serial" in labels || name.contains("[Slow]") || "Local" in labels)`,
},
})
// Serial tests run in isolation, however they must return the cluster to its original state upon exiting.
ext.AddSuite(extension.Suite{
Name: "openshift/cluster-version-operator/conformance/serial",
Parents: []string{"openshift/conformance/serial"},
Qualifiers: []string{
`(name.contains("[Serial]") || "Serial" in labels) && !("Local" in labels)`,
},
})

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@hongkailiu
Copy link
Copy Markdown
Member Author

@hongkailiu
Copy link
Copy Markdown
Member Author

I cannot example why the exception did not work out.
Let me try again before digging.

/test e2e-agnostic-ovn-techpreview-serial-1of3

@hongkailiu
Copy link
Copy Markdown
Member Author

Good. The recent one passed.

$ curl -s https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/pr-logs/pull/openshift_cluster-version-operator/1363/pull-ci-openshift-cluster-version-operator-main-e2e-agnostic-ovn-techpreview-serial-1of3/2039335287229779968/artifacts/e2e-agnostic-ovn-techpreview-serial/openshift-e2e-test/artifacts/e2e.log | grep risks
started: 0/1/44 "[Jira:\"Cluster Version Operator\"] cluster-version-operator should work with accept risks"
passed: (1m1s) 2026-04-01T15:50:55 "[Jira:\"Cluster Version Operator\"] cluster-version-operator should work with accept risks"
started: 0/2/44 "[Jira:\"Cluster Version Operator\"] cluster-version-operator should work with risks from alerts"
passed: (7m1s) 2026-04-01T15:57:56 "[Jira:\"Cluster Version Operator\"] cluster-version-operator should work with risks from alerts"
started: 0/41/44 "[sig-cli][OCPFeatureGate:ClusterUpdateAcceptRisks] oc can operate accept risks [Serial]"
passed: (1.5s) 2026-04-01T16:19:30 "[sig-cli][OCPFeatureGate:ClusterUpdateAcceptRisks] oc can operate accept risks [Serial]"

and

$ curl -s https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/pr-logs/pull/openshift_cluster-version-operator/1363/pull-ci-openshift-cluster-version-operator-main-e2e-agnostic-ovn-techpreview-serial-1of3/2039335287229779968/artifacts/e2e-agnostic-ovn-techpreview-serial/openshift-e2e-test/artifacts/junit/e2e-monitor-tests__20260401-144338.xml | grep 'No new alerts should be firing'
    <testcase name="[Monitor:legacy-test-framework-invariants-alerts][sig-trt][invariant] No new alerts should be firing" time="0"></testcase>

Let us do it again to feel more comfortable.

/test e2e-agnostic-ovn-techpreview-serial-1of3

/retest

@wking
Copy link
Copy Markdown
Member

wking commented Apr 3, 2026

operator-controller-controller-manager failure is unrelated:

/override ci/prow/e2e-agnostic-ovn-techpreview-serial-2of3

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 3, 2026

@wking: Overrode contexts on behalf of wking: ci/prow/e2e-agnostic-ovn-techpreview-serial-2of3

Details

In response to this:

operator-controller-controller-manager failure is unrelated:

/override ci/prow/e2e-agnostic-ovn-techpreview-serial-2of3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Copy link
Copy Markdown
Member

@wking wking left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checking origin/tests in relevant nightly streams:

$ for V in 4.22 5.0; do echo "${V}"; oc image info "registry.ci.openshift.org/ocp/${V}-art-latest:tests" | grep 'Digest\|Created\|/commit/'; done
4.22
Digest:      sha256:44e6285e0059d91f53de226847df7a06443176ba9ba12e28c218fc728dc1e75e
Created:     8h ago
             io.openshift.build.commit.url=https://github.com/openshift/origin/commit/c10db65094b924909f4c3c0af35edb28320142e9
5.0
Digest:      sha256:c23254225909d426810d48398253cef19dbd675baa9e7da1bd4106c66ab8c1ab
Created:     6h ago
             io.openshift.build.commit.url=https://github.com/openshift/origin/commit/c10db65094b924909f4c3c0af35edb28320142e9

And confirming that includes the commit that allows for these alerts:

origin$ git log --first-parent --date=short --format='%ad %h %s' origin/main | grep -n . | grep 'c10db65\|hongkailiu/skip-test-alerts'
2:2026-04-02 c10db65094 Merge pull request #30952 from tthvo/ccm-nlb
10:2026-03-31 2d5316d97e Merge pull request #30929 from hongkailiu/skip-test-alerts

So should be all set. And lifecycle: informing gives us extra flexibility.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 3, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 3, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hongkailiu, wking

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@wking
Copy link
Copy Markdown
Member

wking commented Apr 3, 2026

/verified by #1363 (comment)

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Apr 3, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@wking: This PR has been marked as verified by https://github.com/openshift/cluster-version-operator/pull/1363#issuecomment-4172110607.

Details

In response to this:

/verified by #1363 (comment)

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD d0e0d83 and 2 for PR HEAD 8711da4 in total

@hongkailiu
Copy link
Copy Markdown
Member Author

/retest-required

@hongkailiu
Copy link
Copy Markdown
Member Author

The same commit was green once on e2e-hypershift-conformance

/override ci/prow/e2e-hypershift-conformance

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 3, 2026

@hongkailiu: Overrode contexts on behalf of hongkailiu: ci/prow/e2e-hypershift-conformance

Details

In response to this:

The same commit was green once on e2e-hypershift-conformance

/override ci/prow/e2e-hypershift-conformance

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 3, 2026

@hongkailiu: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit 26e3765 into openshift:main Apr 3, 2026
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants